From: Kenichi Handa <handa@m17n.org>
Date: Sat, 12 Jun 2004 02:21:21 +0000 (+0000)
Subject: (set-language-environment): Load subst tables if necessary.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~22036
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=65ebbdbe8e64b85633b105fa25e8f0678ecdca5e;p=emacs.git

(set-language-environment): Load subst tables if necessary.
---

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 24664f9fc64..0d4abab120c 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1834,6 +1834,15 @@ specifies the character set for the major languages of Western Europe."
   (let ((func (get-language-info language-name 'setup-function)))
     (if (functionp func)
 	(funcall func)))
+  (if (and utf-translate-cjk-mode
+	   utf-translate-cjk-lang-env
+	   (not (eq utf-translate-cjk-lang-env language-name))
+	   (catch 'tag
+	     (dolist (charset (get-language-info language-name 'charset))
+	       (if (memq charset utf-translate-cjk-charsets)
+		   (throw 'tag t)))
+	     nil))
+      (utf-translate-cjk-load-tables))
   (run-hooks 'set-language-environment-hook)
   (force-mode-line-update t))